From 90b4b88629d2562d4b222c0ef8195e53f46a3dc2 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Fri, 27 Aug 2010 12:31:52 +0200 Subject: [PATCH] API: Remove gdk_window_set_back_pixmap() The same effect can be achieved with gdk_window_set_background_pattern(). --- gdk/gdk.symbols | 1 - gdk/gdkprivate.h | 3 --- gdk/gdkwindow.c | 29 ----------------------------- gdk/gdkwindow.h | 3 --- 4 files changed, 36 deletions(-) diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols index 4308af9571..9897904671 100644 --- a/gdk/gdk.symbols +++ b/gdk/gdk.symbols @@ -592,7 +592,6 @@ gdk_window_set_support_multidevice gdk_window_get_support_multidevice gdk_window_has_native gdk_window_set_background -gdk_window_set_back_pixmap gdk_window_set_background_pattern gdk_window_set_cursor gdk_window_shape_combine_region diff --git a/gdk/gdkprivate.h b/gdk/gdkprivate.h index 65038627a1..8e70c98e0a 100644 --- a/gdk/gdkprivate.h +++ b/gdk/gdkprivate.h @@ -31,9 +31,6 @@ G_BEGIN_DECLS -#define GDK_PARENT_RELATIVE_BG ((GdkPixmap *)1L) -#define GDK_NO_BG ((GdkPixmap *)2L) - #ifndef GDK_COMPILATION #define GDK_WINDOW_TYPE(d) (gdk_window_get_window_type (GDK_WINDOW (d))) #define GDK_WINDOW_DESTROYED(d) (gdk_window_is_destroyed (GDK_WINDOW (d))) diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 875de931ee..8432ce0e3c 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -6716,35 +6716,6 @@ gdk_window_set_background (GdkWindow *window, cairo_pattern_destroy (pattern); } -/* NB: This is more or less a hack now and about to go away. */ -void -gdk_window_set_back_pixmap (GdkWindow *window, - GdkPixmap *pixmap, - gboolean parent_relative) -{ - cairo_pattern_t *pattern; - - g_return_if_fail (GDK_IS_WINDOW (window)); - g_return_if_fail (pixmap == NULL || !parent_relative); - - if (parent_relative || pixmap == NULL) - pattern = NULL; - else - { - static cairo_user_data_key_t key; - cairo_surface_t *surface = _gdk_drawable_ref_cairo_surface (pixmap); - pattern = cairo_pattern_create_for_surface (surface); - cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT); - g_object_ref (pixmap); - cairo_pattern_set_user_data (pattern, &key, pixmap, g_object_unref); - } - - gdk_window_set_background_pattern (window, pattern); - - if (pattern) - cairo_pattern_destroy (pattern); -} - /** * gdk_window_set_background_pattern: * @window: a #GdkWindow diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h index 3ce4abdafe..25c8ed03f7 100644 --- a/gdk/gdkwindow.h +++ b/gdk/gdkwindow.h @@ -675,9 +675,6 @@ void gdk_window_set_transient_for (GdkWindow *window, GdkWindow *parent); void gdk_window_set_background (GdkWindow *window, const GdkColor *color); -void gdk_window_set_back_pixmap (GdkWindow *window, - GdkPixmap *pixmap, - gboolean parent_relative); void gdk_window_set_background_pattern (GdkWindow *window, cairo_pattern_t *pattern); cairo_pattern_t *gdk_window_get_background_pattern (GdkWindow *window); -- 2.30.2